@@ -1,9 +1,9 @@  | 
            ||
| 1 | 1 | 
                # -*- coding: utf-8 -*-  | 
            
| 2 | 2 | 
                 | 
            
| 3 | 
                -from curtail_uuid import CurtailUUID  | 
            |
| 4 | 3 | 
                from djadmin import ChangeOnlyModelAdmin, ReadOnlyModelAdmin  | 
            
| 5 | 4 | 
                from django.contrib import admin  | 
            
| 6 | 5 | 
                from django.db import transaction  | 
            
| 6 | 
                +from django_curtail_uuid import CurtailUUID  | 
            |
| 7 | 7 | 
                 | 
            
| 8 | 8 | 
                from account.models import (FranchiserInfo, LensmanIncomeExpensesInfo, LensmanInfo, SaleclerkInfo, TourGuideInfo,  | 
            
| 9 | 9 | 
                UserIncomeExpensesInfo, UserInfo)  | 
            
                @@ -1,8 +1,8 @@  | 
            ||
| 1 | 1 | 
                # -*- coding: utf-8 -*-  | 
            
| 2 | 2 | 
                 | 
            
| 3 | 
                -from curtail_uuid import CurtailUUID  | 
            |
| 4 | 3 | 
                from django.contrib.auth.models import Group, User  | 
            
| 5 | 4 | 
                from django.db import transaction  | 
            
| 5 | 
                +from django_curtail_uuid import CurtailUUID  | 
            |
| 6 | 6 | 
                from django_response import response  | 
            
| 7 | 7 | 
                from ipaddr import client_ip  | 
            
| 8 | 8 | 
                from logit import logit  | 
            
                @@ -2,8 +2,8 @@  | 
            ||
| 2 | 2 | 
                 | 
            
| 3 | 3 | 
                from __future__ import division  | 
            
| 4 | 4 | 
                 | 
            
| 5 | 
                -from curtail_uuid import CurtailUUID  | 
            |
| 6 | 5 | 
                from django.db import transaction  | 
            
| 6 | 
                +from django_curtail_uuid import CurtailUUID  | 
            |
| 7 | 7 | 
                from django_response import response  | 
            
| 8 | 8 | 
                from ipaddr import client_ip  | 
            
| 9 | 9 | 
                from isoweek import Week  | 
            
                @@ -5,9 +5,9 @@ from __future__ import division  | 
            ||
| 5 | 5 | 
                import json  | 
            
| 6 | 6 | 
                 | 
            
| 7 | 7 | 
                import shortuuid  | 
            
| 8 | 
                -from curtail_uuid import CurtailUUID  | 
            |
| 9 | 8 | 
                from django.conf import settings  | 
            
| 10 | 9 | 
                from django.core.serializers.json import DjangoJSONEncoder  | 
            
| 10 | 
                +from django_curtail_uuid import CurtailUUID  | 
            |
| 11 | 11 | 
                from django_response import response  | 
            
| 12 | 12 | 
                from logit import logit  | 
            
| 13 | 13 | 
                from TimeConvert import TimeConvert as tc  | 
            
                @@ -2,9 +2,9 @@  | 
            ||
| 2 | 2 | 
                 | 
            
| 3 | 3 | 
                from __future__ import division  | 
            
| 4 | 4 | 
                 | 
            
| 5 | 
                -from curtail_uuid import CurtailUUID  | 
            |
| 6 | 5 | 
                from django.conf import settings  | 
            
| 7 | 6 | 
                from django.db import connection, transaction  | 
            
| 7 | 
                +from django_curtail_uuid import CurtailUUID  | 
            |
| 8 | 8 | 
                from django_response import response  | 
            
| 9 | 9 | 
                from logit import logit  | 
            
| 10 | 10 | 
                from paginator import pagination  | 
            
                @@ -1,8 +1,8 @@  | 
            ||
| 1 | 1 | 
                # -*- coding: utf-8 -*-  | 
            
| 2 | 2 | 
                 | 
            
| 3 | 
                -from curtail_uuid import CurtailUUID  | 
            |
| 4 | 3 | 
                from django.conf import settings  | 
            
| 5 | 4 | 
                from django.db import transaction  | 
            
| 5 | 
                +from django_curtail_uuid import CurtailUUID  | 
            |
| 6 | 6 | 
                from django_response import response  | 
            
| 7 | 7 | 
                from ipaddr import client_ip  | 
            
| 8 | 8 | 
                from logit import logit  | 
            
                @@ -1,8 +1,8 @@  | 
            ||
| 1 | 1 | 
                # -*- coding: utf-8 -*-  | 
            
| 2 | 2 | 
                 | 
            
| 3 | 
                -from curtail_uuid import CurtailUUID  | 
            |
| 4 | 3 | 
                from django.db import transaction  | 
            
| 5 | 4 | 
                from django.shortcuts import render  | 
            
| 5 | 
                +from django_curtail_uuid import CurtailUUID  | 
            |
| 6 | 6 | 
                from django_response import response  | 
            
| 7 | 7 | 
                from ipaddr import client_ip  | 
            
| 8 | 8 | 
                from logit import logit  | 
            
                @@ -1,12 +1,12 @@  | 
            ||
| 1 | 
                -CodeConvert==2.0.4  | 
            |
| 2 | 
                -Django==1.11.9  | 
            |
| 1 | 
                +CodeConvert==2.0.5  | 
            |
| 2 | 
                +Django==1.11.11  | 
            |
| 3 | 3 | 
                MySQL-python==1.2.5  | 
            
| 4 | 4 | 
                Pillow==5.0.0  | 
            
| 5 | 5 | 
                StatusCode==1.0.0  | 
            
| 6 | 
                -TimeConvert==1.4.1  | 
            |
| 6 | 
                +TimeConvert==1.4.3  | 
            |
| 7 | 7 | 
                cryptography==1.5.2  | 
            
| 8 | 8 | 
                django-admin==1.1.1  | 
            
| 9 | 
                -django-curtail-uuid==1.0.0  | 
            |
| 9 | 
                +django-curtail-uuid==1.0.4  | 
            |
| 10 | 10 | 
                django-detect==1.0.5  | 
            
| 11 | 11 | 
                django-file-md5==1.0.1  | 
            
| 12 | 12 | 
                django-file-upload==1.0.0  | 
            
                @@ -24,14 +24,14 @@ django-rlog==1.0.7  | 
            ||
| 24 | 24 | 
                django-shortuuidfield==0.1.3  | 
            
| 25 | 25 | 
                django-six==1.0.4  | 
            
| 26 | 26 | 
                django-uniapi==1.0.1  | 
            
| 27 | 
                -django-we==1.1.2  | 
            |
| 27 | 
                +django-we==1.1.4  | 
            |
| 28 | 28 | 
                djangorestframework==3.7.7  | 
            
| 29 | 29 | 
                furl==1.0.1  | 
            
| 30 | 30 | 
                hiredis==0.2.0  | 
            
| 31 | 31 | 
                isoweek==1.3.3  | 
            
| 32 | 32 | 
                jsonfield==2.0.2  | 
            
| 33 | 33 | 
                mock==2.0.0  | 
            
| 34 | 
                -pysnippets==1.0.4  | 
            |
| 34 | 
                +pysnippets==1.0.5  | 
            |
| 35 | 35 | 
                pywe-jssdk==1.0.2  | 
            
| 36 | 36 | 
                pywe-miniapp==1.0.2  | 
            
| 37 | 37 | 
                pywe-oauth==1.0.6  | 
            
                @@ -42,7 +42,7 @@ pywe-sign==1.0.6  | 
            ||
| 42 | 42 | 
                pywe-xml==1.0.0  | 
            
| 43 | 43 | 
                qiniu==7.2.0  | 
            
| 44 | 44 | 
                redis==2.10.6  | 
            
| 45 | 
                -redis-extensions==1.2.0  | 
            |
| 45 | 
                +redis-extensions==1.2.1  | 
            |
| 46 | 46 | 
                requests==2.18.4  | 
            
| 47 | 47 | 
                rlog==0.3  | 
            
| 48 | 48 | 
                rsa==3.4.2  | 
            
                @@ -1,6 +1,6 @@  | 
            ||
| 1 | 1 | 
                # -*- coding: utf-8 -*-  | 
            
| 2 | 2 | 
                 | 
            
| 3 | 
                -from curtail_uuid import CurtailUUID  | 
            |
| 3 | 
                +from django_curtail_uuid import CurtailUUID  | 
            |
| 4 | 4 | 
                 | 
            
| 5 | 5 | 
                from photo.models import UUIDInfo  | 
            
| 6 | 6 | 
                from utils.redis.connect import r  |